From 13858fde29e9626d1d959d436f87105263bced98 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Apr 2013 18:46:41 -0400 Subject: [PATCH] GtkGrid: Undo a size allocation tweak Revert 5e1a06d1b124f09a1a54d5ae0f38905dbdc2cc81 This change caused empty rows to 'open up', which was not intended and causes problems as seen in bug 698660. --- gtk/gtkgrid.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c index 850cb094d2..a1183e892d 100644 --- a/gtk/gtkgrid.c +++ b/gtk/gtkgrid.c @@ -617,18 +617,8 @@ gtk_grid_request_init (GtkGridRequest *request, child = list->data; attach = &child->attach[orientation]; - if (attach->span != 1) - continue; - if (gtk_widget_compute_expand (child->widget, orientation)) + if (attach->span == 1 && gtk_widget_compute_expand (child->widget, orientation)) lines->lines[attach->pos - lines->min].expand = TRUE; - - lines->lines[attach->pos - lines->min].empty = FALSE; - } - - for (i = 0; i < lines->max - lines->min; i++) - { - if (lines->lines[i].empty) - lines->lines[i].expand = TRUE; } } @@ -1037,8 +1027,6 @@ gtk_grid_request_compute_expand (GtkGridRequest *request, if (attach->pos + i >= max || attach->pos + 1 < min) continue; - if (line->empty) - line->expand = TRUE; line->empty = FALSE; } -- 2.30.2